use pandas.to_timedelta function instead of invoking deprecated ctor arg #918

marscher · 2024-03-06T09:36:19Z

Changes

Pandas 2.2 deprecated the unit argument of the Timedeltaindex constructor and suggests to use pandas.totimedelta function instaed. This PR changes this as suggested.

Related Issues

properly fixes #909

Checks

updated CHANGELOG.md
updated tests/

…(unit argument will be gone)

github-actions · 2024-03-06T09:40:57Z

Test Results

2 188 tests ±0 2 187 ✅ +1 2m 45s ⏱️ -20s
1 suites ±0 1 💤 ±0
1 files ±0 0 ❌ - 1

Results for commit 2e6c519. ± Comparison against base commit 82b79b1.

This pull request removes 62 and adds 62 tests. Note that renamed tests count towards both.

weldx.tests.test_time.TestTime ‑ test_add_datetime[TimedeltaIndex-False-False-False]
weldx.tests.test_time.TestTime ‑ test_add_datetime[TimedeltaIndex-False-False-True]
weldx.tests.test_time.TestTime ‑ test_add_datetime[TimedeltaIndex-False-True-False]
weldx.tests.test_time.TestTime ‑ test_add_datetime[TimedeltaIndex-False-True-True]
weldx.tests.test_time.TestTime ‑ test_add_datetime[TimedeltaIndex-True-False-False]
weldx.tests.test_time.TestTime ‑ test_add_datetime[TimedeltaIndex-True-False-True]
weldx.tests.test_time.TestTime ‑ test_add_datetime[TimedeltaIndex-True-True-False]
weldx.tests.test_time.TestTime ‑ test_add_datetime[TimedeltaIndex-True-True-True]
weldx.tests.test_time.TestTime ‑ test_add_timedelta[TimedeltaIndex-h-False-False-False]
weldx.tests.test_time.TestTime ‑ test_add_timedelta[TimedeltaIndex-h-False-False-True]
…

weldx.tests.test_time.TestTime ‑ test_add_datetime[to_timedelta-False-False-False]
weldx.tests.test_time.TestTime ‑ test_add_datetime[to_timedelta-False-False-True]
weldx.tests.test_time.TestTime ‑ test_add_datetime[to_timedelta-False-True-False]
weldx.tests.test_time.TestTime ‑ test_add_datetime[to_timedelta-False-True-True]
weldx.tests.test_time.TestTime ‑ test_add_datetime[to_timedelta-True-False-False]
weldx.tests.test_time.TestTime ‑ test_add_datetime[to_timedelta-True-False-True]
weldx.tests.test_time.TestTime ‑ test_add_datetime[to_timedelta-True-True-False]
weldx.tests.test_time.TestTime ‑ test_add_datetime[to_timedelta-True-True-True]
weldx.tests.test_time.TestTime ‑ test_add_timedelta[to_timedelta-h-False-False-False]
weldx.tests.test_time.TestTime ‑ test_add_timedelta[to_timedelta-h-False-False-True]
…

♻️ This comment has been updated with latest results.

codecov · 2024-03-06T10:50:51Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.48%. Comparing base (1750f5d) to head (2e6c519).
Report is 1 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #918      +/-   ##
==========================================
+ Coverage   96.45%   96.48%   +0.03%     
==========================================
  Files          95       95              
  Lines        6287     6293       +6     
==========================================
+ Hits         6064     6072       +8     
+ Misses        223      221       -2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

CagtayFabry · 2024-03-06T11:09:27Z

Thanks for the fixes @marscher !

what is the minimum pandas version required for this?
Does it work with 1.5.x still?

marscher · 2024-03-06T11:14:50Z

what is the minimum pandas version required for this? Does it work with 1.5.x still?

I've added some backward compatibility code for reading old unit suffixes. Currently it only replaces the (used by weldx schema examples) suffix for seconds "S". I am not aware of any other units used in the past by weldx. To ensure we can still load old files with the new version, we should probably complete this list.

marscher · 2024-03-06T11:15:23Z

weldx/tags/time/timedeltaindex.py

@@ -9,6 +9,14 @@
 __all__ = ["TimedeltaIndexConverter"]


+def _handle_converted_pd_tdi_units(node: TaggedDict):


backward compat @CagtayFabry

changelog of pandas:

Units ‘H’, ‘T’, ‘S’, ‘L’, ‘U’ and ‘N’ are deprecated and will be removed in a future version. Please use ‘h’, ‘min’, ‘s’, ‘ms’, ‘us’, and ‘ns’ instead of ‘H’, ‘T’, ‘S’, ‘L’, ‘U’ and ‘N’.

marscher · 2024-03-06T11:17:01Z

Sorry I misinterpreted your question. I did not check, if it works with old Pandas versions. Is this a requirement or can we just pin a minimum version?

marscher · 2024-03-06T11:44:27Z

I've tested pandas-1.5 with Python-3.11 locally and all tests pass.

This reverts commit 89a294d.

marscher · 2024-03-06T12:28:24Z

The CI failures are unrelated to my changes. I think this one is ready to go.

CagtayFabry · 2024-03-06T13:38:53Z

I've tested pandas-1.5 with Python-3.11 locally and all tests pass.

If you tested it with 1.5 I am fine with pinning minimum pandas version >=1.5. 😊
I will update the CI to test for that later as well

weldx/tags/time/timedeltaindex.py

Co-authored-by: Çağtay Fabry <[email protected]>

use pandas.to_timedelta function instead of invoking deprecated ctor …

4fac5dd

…(unit argument will be gone)

marscher added 9 commits March 6, 2024 10:57

fix schema example unit

98007cb

fix timedeltaindex convert

d17fa7e

typo

019590b

typo

4dae9cb

use util func

a2c9527

fix doctest

faac3a0

use util func instead of TDI

22f7f46

use util func instead of TDI

2f8e560

unpin nbval

a5ae033

marscher added 3 commits March 6, 2024 11:51

updated changelog

4dfab6b

treat FutureWarning as error during testing

b89c520

disabled "treat FutureWarning as error during testing"

47c7861

marscher marked this pull request as ready for review March 6, 2024 11:09

marscher commented Mar 6, 2024

View reviewed changes

handle all old units

18626b0

marscher added 3 commits March 6, 2024 12:46

handle all old units

e758b18

minor change (asdf warning)

89a294d

Revert "minor change (asdf warning)"

33566c1

This reverts commit 89a294d.

CagtayFabry self-requested a review March 6, 2024 19:30

pandas >=1.5

737c7e4

CagtayFabry reviewed Mar 6, 2024

View reviewed changes

weldx/tags/time/timedeltaindex.py Outdated Show resolved Hide resolved

Update weldx/tags/time/timedeltaindex.py

2e6c519

Co-authored-by: Çağtay Fabry <[email protected]>

marscher merged commit ab583be into BAMWelDX:master Mar 12, 2024
18 of 21 checks passed

marscher deleted the pandas_upgrade_timedelta branch March 12, 2024 08:14

CagtayFabry mentioned this pull request Mar 12, 2024

pin pandas & pytest #917

Closed

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

use pandas.to_timedelta function instead of invoking deprecated ctor arg #918

use pandas.to_timedelta function instead of invoking deprecated ctor arg #918

marscher commented Mar 6, 2024 •

edited

Loading

github-actions bot commented Mar 6, 2024 •

edited

Loading

codecov bot commented Mar 6, 2024 •

edited

Loading

CagtayFabry commented Mar 6, 2024

marscher commented Mar 6, 2024

marscher Mar 6, 2024

marscher Mar 6, 2024

marscher commented Mar 6, 2024

marscher commented Mar 6, 2024

marscher commented Mar 6, 2024

CagtayFabry commented Mar 6, 2024

		@@ -9,6 +9,14 @@
		__all__ = ["TimedeltaIndexConverter"]


		def _handle_converted_pd_tdi_units(node: TaggedDict):

use pandas.to_timedelta function instead of invoking deprecated ctor arg #918

use pandas.to_timedelta function instead of invoking deprecated ctor arg #918

Conversation

marscher commented Mar 6, 2024 • edited Loading

Changes

Related Issues

Checks

github-actions bot commented Mar 6, 2024 • edited Loading

Test Results

codecov bot commented Mar 6, 2024 • edited Loading

Codecov Report

CagtayFabry commented Mar 6, 2024

marscher commented Mar 6, 2024

marscher Mar 6, 2024

Choose a reason for hiding this comment

marscher Mar 6, 2024

Choose a reason for hiding this comment

marscher commented Mar 6, 2024

marscher commented Mar 6, 2024

marscher commented Mar 6, 2024

CagtayFabry commented Mar 6, 2024

marscher commented Mar 6, 2024 •

edited

Loading

github-actions bot commented Mar 6, 2024 •

edited

Loading

codecov bot commented Mar 6, 2024 •

edited

Loading